From 9f3f640c0db38d0ca072bb4d372f84a669b4033a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Timm=20B=C3=A4der?= <mail@baedert.org>
Date: Mon, 14 Aug 2017 12:20:42 +0200
Subject: [PATCH] widget: Remove gtk_widget_get_border_allocation

---
 gtk/gtkcolorswatch.c   |  7 +++----
 gtk/gtkentry.c         |  5 ++---
 gtk/gtknotebook.c      |  2 +-
 gtk/gtkrange.c         |  2 +-
 gtk/gtkscale.c         |  2 +-
 gtk/gtkwidget.c        | 22 ----------------------
 gtk/gtkwidgetprivate.h |  2 --
 7 files changed, 8 insertions(+), 34 deletions(-)

diff --git a/gtk/gtkcolorswatch.c b/gtk/gtkcolorswatch.c
index e24fa2e21f..c14f7460de 100644
--- a/gtk/gtkcolorswatch.c
+++ b/gtk/gtkcolorswatch.c
@@ -98,18 +98,17 @@ swatch_snapshot (GtkWidget   *widget,
     {
       cairo_pattern_t *pattern;
       cairo_matrix_t matrix;
-      GtkAllocation border_allocation;
+      int width, height;
       GskRoundedRect content_box;
 
-      gtk_widget_get_border_allocation (widget, &border_allocation);
+      gtk_widget_get_content_size (widget, &width, &height);
 
       gtk_rounded_boxes_init_for_style (NULL,
                                         NULL,
                                         &content_box,
                                         gtk_style_context_lookup_style (context),
                                         0, 0,
-                                        border_allocation.width,
-                                        border_allocation.height);
+                                        width, height);
       gtk_snapshot_push_rounded_clip (snapshot,
                                       &content_box,
                                       "ColorSwatchClip");
diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index b05bfe2a4e..26fd08dc28 100644
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -7961,9 +7961,8 @@ gtk_entry_get_icon_at_pos (GtkEntry *entry,
       if (icon_info == NULL)
         continue;
 
-      gtk_widget_get_border_allocation (icon_info->widget, &allocation);
-      if (x >= allocation.x && x < allocation.x + allocation.width &&
-          y >= allocation.y && y < allocation.y + allocation.height)
+      gtk_widget_get_outer_allocation (icon_info->widget, &allocation);
+      if (gdk_rectangle_contains_point (&allocation, x, y))
         return i;
     }
 
diff --git a/gtk/gtknotebook.c b/gtk/gtknotebook.c
index fc80e5a3fa..82068ca266 100644
--- a/gtk/gtknotebook.c
+++ b/gtk/gtknotebook.c
@@ -2412,7 +2412,7 @@ get_drop_position (GtkNotebook *notebook)
         {
           GtkAllocation allocation;
 
-          gtk_widget_get_border_allocation (page->tab_widget, &allocation);
+          gtk_widget_get_outer_allocation (page->tab_widget, &allocation);
 
           switch (priv->tab_pos)
             {
diff --git a/gtk/gtkrange.c b/gtk/gtkrange.c
index 2f21352216..d10f3bd14d 100644
--- a/gtk/gtkrange.c
+++ b/gtk/gtkrange.c
@@ -2705,7 +2705,7 @@ gtk_range_update_mouse_location (GtkRange *range)
   y = priv->mouse_y;
 
   gtk_widget_get_own_allocation (widget, &range_alloc);
-  gtk_widget_get_border_allocation (priv->trough_widget, &trough_alloc);
+  gtk_widget_get_outer_allocation (priv->trough_widget, &trough_alloc);
 
   gtk_widget_get_outer_allocation (priv->slider_widget, &slider_alloc);
   gtk_widget_translate_coordinates (priv->trough_widget, widget,
diff --git a/gtk/gtkscale.c b/gtk/gtkscale.c
index dc72a09abb..48ff14fab5 100644
--- a/gtk/gtkscale.c
+++ b/gtk/gtkscale.c
@@ -333,7 +333,7 @@ gtk_scale_allocate_value (GtkScale      *scale,
   gtk_widget_get_content_size (widget, &range_width, &range_height);
 
   slider_widget = gtk_range_get_slider_widget (range);
-  gtk_widget_get_border_allocation (slider_widget, &slider_alloc);
+  gtk_widget_get_outer_allocation (slider_widget, &slider_alloc);
 
   gtk_widget_measure (priv->value_widget,
                       GTK_ORIENTATION_HORIZONTAL, -1,
diff --git a/gtk/gtkwidget.c b/gtk/gtkwidget.c
index f53ce85fd3..014552febd 100644
--- a/gtk/gtkwidget.c
+++ b/gtk/gtkwidget.c
@@ -13272,28 +13272,6 @@ gtk_widget_get_content_size (GtkWidget *widget,
              margin.bottom + border.bottom + padding.bottom;
 }
 
-void
-gtk_widget_get_border_allocation (GtkWidget     *widget,
-                                  GtkAllocation *allocation)
-{
-  GtkWidgetPrivate *priv = gtk_widget_get_instance_private (widget);
-  GtkBorder margin, border;
-  GtkCssStyle *style;
-
-  style = gtk_css_node_get_style (priv->cssnode);
-  get_box_margin (style, &margin);
-  get_box_border (style, &border);
-
-  *allocation = priv->allocation;
-
-  allocation->x += margin.left + border.left;
-  allocation->y += margin.top + border.top;
-  allocation->width -= margin.left + border.left +
-                       margin.right + border.right;
-  allocation->height -= margin.top + border.top +
-                        margin.bottom + border.bottom;
-}
-
 /**
  * gtk_widget_get_allocated_width:
  * @widget: the widget to query
diff --git a/gtk/gtkwidgetprivate.h b/gtk/gtkwidgetprivate.h
index 93dcbcac8e..5a3472863a 100644
--- a/gtk/gtkwidgetprivate.h
+++ b/gtk/gtkwidgetprivate.h
@@ -314,8 +314,6 @@ void              gtk_widget_focus_sort                    (GtkWidget        *wi
 gboolean          gtk_widget_focus_move                    (GtkWidget        *widget,
                                                             GtkDirectionType  direction,
                                                             GPtrArray        *focus_order);
-void              gtk_widget_get_border_allocation         (GtkWidget        *widget,
-                                                            GtkAllocation    *allocation);
 void              gtk_widget_get_outer_allocation          (GtkWidget        *widget,
                                                             GtkAllocation    *allocation);
 void              gtk_widget_get_own_allocation            (GtkWidget        *widget,
-- 
2.30.2